Make gtk_widget_activate_action better

As a convenience API, this should be easy to use,
so don't expect callers to manually create a
variant, do it for them.

Update all callers.

diff --git a/gtk/gtkcolorswatch.c b/gtk/gtkcolorswatch.c
index 6932fa2413733bec4c6720fe6747f9608b2188bd..d17093fe9a689d513cd5e47c02f853bf8b80a2c7 100644 (file)
--- a/gtk/gtkcolorswatch.c
+++ b/gtk/gtkcolorswatch.c
@@ -226,12 +226,11 @@ activate_color (GtkColorSwatch *swatch)
 {
   GtkColorSwatchPrivate *priv = gtk_color_swatch_get_instance_private (swatch);
   gtk_widget_activate_action (GTK_WIDGET (swatch),
-                              "color.select",
-                              g_variant_new ("(dddd)",
-                                             priv->color.red,
-                                             priv->color.green,
-                                             priv->color.blue,
-                                             priv->color.alpha));
+                              "color.select", "(dddd)",
+                              priv->color.red,
+                              priv->color.green,
+                              priv->color.blue,
+                              priv->color.alpha);
 }
 
 static void
@@ -239,12 +238,11 @@ customize_color (GtkColorSwatch *swatch)
 {
   GtkColorSwatchPrivate *priv = gtk_color_swatch_get_instance_private (swatch);
   gtk_widget_activate_action (GTK_WIDGET (swatch),
-                              "color.customize",
-                              g_variant_new ("(dddd)",
-                                             priv->color.red,
-                                             priv->color.green,
-                                             priv->color.blue,
-                                             priv->color.alpha));
+                              "color.customize", "(dddd)",
+                              priv->color.red,
+                              priv->color.green,
+                              priv->color.blue,
+                              priv->color.alpha);
 }
 
 static gboolean

diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 01cc8f3ba046c6c983f5fd3ba03f7fc7fa4f5045..eeede5d3a6341c5bf13b1c73d9a65f347c1802b2 100644 (file)
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -8815,7 +8815,6 @@ append_bubble_item (GtkTextView *text_view,
   const char *icon_name;
   const char *action_name;
   GMenuModel *link;
-  char **split = NULL;
   gboolean is_toggle_action = FALSE;
   GActionGroup *group = NULL;
   gboolean enabled;

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 1aff2005fd4bf1f77e6cc1dd22383fc31e37dae0..1768e3cd993dc69d866129688b0fe66a069ff727 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -12428,7 +12428,9 @@ gtk_widget_get_template_child (GtkWidget   *widget,
  * gtk_widget_activate_action:
  * @widget: a #GtkWidget
  * @name: a prefixed action name
- * @parameter: parameters that required by the action
+ * @format_string: GVariant format string for arguments or %NULL
+ *    for no arguments
+ * @...: arguments, as given by format string
  *
  * Looks up the action in the action groups associated
  * with @widget and its ancestors, and activates it.
@@ -12437,21 +12439,39 @@ gtk_widget_get_template_child (GtkWidget   *widget,
  * prefix that was used when adding the action group
  * with gtk_widget_insert_action_group().
  *
- * The @parameter must match the actions expected parameter
+ * The arguments must match the actions expected parameter
  * type, as returned by g_action_get_parameter_type().
  */
 void
 gtk_widget_activate_action (GtkWidget  *widget,
                             const char *name,
-                            GVariant   *parameter)
+                            const char *format_string,
+                            ...)
 {
   GtkActionMuxer *muxer;
 
   muxer = _gtk_widget_get_action_muxer (widget, FALSE);
   if (muxer)
-    g_action_group_activate_action (G_ACTION_GROUP (muxer),
-                                    name,
-                                    parameter);
+    {
+      GVariant *parameters = NULL;
+
+      if (format_string != NULL)
+        {
+          va_list args;
+
+          va_start (args, format_string);
+          parameters = g_variant_new_va (format_string, NULL, &args);
+          va_end (args);
+
+          g_variant_ref_sink (parameters);
+        }
+
+      g_action_group_activate_action (G_ACTION_GROUP (muxer),
+                                      name,
+                                      parameters);
+
+      g_clear_pointer (&parameters, g_variant_unref);
+    }
 }
 
 /**

diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h
index e2cec9400a17239f3d28f6f857ac4113eb40056a..dd411945a94a3fb5ce2c25ec798d06d537bb0b19 100644 (file)
--- a/gtk/gtkwidget.h
+++ b/gtk/gtkwidget.h
@@ -978,7 +978,8 @@ void                    gtk_widget_insert_action_group  (GtkWidget    *widget,
 GDK_AVAILABLE_IN_ALL
 void                    gtk_widget_activate_action      (GtkWidget  *widget,
                                                          const char *name,
-                                                         GVariant   *parameter);
+                                                         const char *format_string,
+                                                         ...);
 
 GDK_AVAILABLE_IN_ALL
 void                   gtk_widget_activate_default      (GtkWidget *widget);